Autogenerated HTML docs for v1.5.4.3-325-g6d21
diff --git a/git-checkout.html b/git-checkout.html index 83420b0..e5a74dd 100644 --- a/git-checkout.html +++ b/git-checkout.html
@@ -330,15 +330,16 @@ </dt> <dd> <p> - When -b is given and a branch is created off a remote branch, - set up configuration so that git-pull will automatically - retrieve data from the remote branch. Use this if you always - pull from the same remote branch into the new branch, or if you - don't want to use "git pull <repository> <refspec>" explicitly. - This behavior is the default. Set the - branch.autosetupmerge configuration variable to false if you - want git-checkout and git-branch to always behave as if - <em>--no-track</em> were given. + When creating a new branch, set up configuration so that git-pull + will automatically retrieve data from the start point, which must be + a branch. Use this if you always pull from the same upstream branch + into the new branch, and if you don't want to use "git pull + <repository> <refspec>" explicitly. This behavior is the default + when the start point is a remote branch. Set the + branch.autosetupmerge configuration variable to <tt>false</tt> if you want + git-checkout and git-branch to always behave as if <em>--no-track</em> were + given. Set it to <tt>always</tt> if you want this behavior when the + start-point is either a local or remote branch. </p> </dd> <dt> @@ -346,10 +347,7 @@ </dt> <dd> <p> - When -b is given and a branch is created off a remote branch, - set up configuration so that git-pull will not retrieve data - from the remote branch, ignoring the branch.autosetupmerge - configuration variable. + Ignore the branch.autosetupmerge configuration variable. </p> </dd> <dt> @@ -541,7 +539,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 12-Feb-2008 03:18:04 UTC +Last updated 28-Feb-2008 00:25:37 UTC </div> </div> </body>
